Heat capture and storage is important in both solar energy projects and in the recovery of waste heat from industrial processes. Whereas heat capture will mostly rely on the use of a heat carrier, the high efficiency heat storage needs to combine sensible and latent heat storage with phase change materials (PCMs) to provide a high energy density storage. The present paper briefly reviews energy developments and storage techniques, with special emphasis on thermal energy storage and the use of PCM. It thereafter illustrates first results obtained when encapsulating NaNO3/KNO3-PCM in an AISI 321 tube, as example of a storage application using a multi-tubular exchanger filled with PCM. To increase the effective thermal conductivity of the PCM, 2 inserts i.e. metallic foam and metallic sponge are also tested. Experimental discharging (cooling) rates are interpreted by both solving the unsteady-state conduction equation, and by using Comsol Multiphysics. Predictions and experimental temperature evolutions are in fair agreement, and the effect of the inserts is clearly reflected by the increased effective thermal conductivity of the insert-PCM composite. Application of Comsol to predict the mechanical behavior of the system, when melting and associated expansion increase the internal pressure, demonstrates that the pressure build-up is far below the Young's modulus of the AISI 321 encapsulation and that this shell will not crack.