Implemented Cacheing of A2h and various tests added